mwan3: in ubus rpcd script fix shell local issue

To fix the shell local issue in the ubus mwan3 rpcd shell script, move
the switch case statment into a function.

Signed-off-by: Florian Eckert <[email protected]>

diff --git a/net/mwan3/files/usr/libexec/rpcd/mwan3 b/net/mwan3/files/usr/libexec/rpcd/mwan3
index a772e133e8cb27421f913f848a90415cedca3a34..c30b6a1b93b03249ec5fcf0432c0d67cb3514f14 100755 (executable)
--- a/net/mwan3/files/usr/libexec/rpcd/mwan3
+++ b/net/mwan3/files/usr/libexec/rpcd/mwan3
@@ -74,60 +74,65 @@ get_mwan3_status() {
        fi
 }
 
-case "$1" in
-       list)
-               json_init
-               json_add_object "status"
-               json_add_string "section" "x"
-               json_add_string "interface" "x"
-               json_close_object
-               json_dump
-               ;;
-       call)
-               case "$2" in
-               status)
-                       local section iface
-                       read input;
-                       json_load "$input"
-                       json_get_var section section
-                       json_get_var iface interface
-
-                       config_load mwan3
+main () {
+
+       case "$1" in
+               list)
                        json_init
-                       case "$section" in
-                               interfaces)
-                                       json_add_object interfaces
-                                       config_foreach get_mwan3_status interface "${iface}"
-                                       json_close_object
-                                       ;;
-                               connected)
-                                       json_add_object connected
-                                       json_add_array ipv4
-                                       report_connected_v4
-                                       json_close_array
-                                       json_add_array ipv6
-                                       report_connected_v6
-                                       json_close_array
-                                       json_close_object
-                                       ;;
-                               *)
-                                       # interfaces
-                                       json_add_object interfaces
-                                       config_foreach get_mwan3_status interface
-                                       json_close_object
-                                       # connected
-                                       json_add_object connected
-                                       json_add_array ipv4
-                                       report_connected_v4
-                                       json_close_array
-                                       json_add_array ipv6
-                                       report_connected_v6
-                                       json_close_array
-                                       json_close_object
-                                       ;;
-                       esac
+                       json_add_object "status"
+                       json_add_string "section" "x"
+                       json_add_string "interface" "x"
+                       json_close_object
                        json_dump
                        ;;
-               esac
-               ;;
-esac
+               call)
+                       case "$2" in
+                       status)
+                               local section iface
+                               read input;
+                               json_load "$input"
+                               json_get_var section section
+                               json_get_var iface interface
+
+                               config_load mwan3
+                               json_init
+                               case "$section" in
+                                       interfaces)
+                                               json_add_object interfaces
+                                               config_foreach get_mwan3_status interface "${iface}"
+                                               json_close_object
+                                               ;;
+                                       connected)
+                                               json_add_object connected
+                                               json_add_array ipv4
+                                               report_connected_v4
+                                               json_close_array
+                                               json_add_array ipv6
+                                               report_connected_v6
+                                               json_close_array
+                                               json_close_object
+                                               ;;
+                                       *)
+                                               # interfaces
+                                               json_add_object interfaces
+                                               config_foreach get_mwan3_status interface
+                                               json_close_object
+                                               # connected
+                                               json_add_object connected
+                                               json_add_array ipv4
+                                               report_connected_v4
+                                               json_close_array
+                                               json_add_array ipv6
+                                               report_connected_v6
+                                               json_close_array
+                                               json_close_object
+                                               ;;
+                               esac
+                               json_dump
+                               ;;
+                       esac
+                       ;;
+       esac
+}
+
+main "$@"